Bug: None Test: make checkbuild && ./run_tests.py Change-Id: I9e755c76a760f218abd871008e3d48c8f044afd1