Bug: 70041899 Test: TreeHugger + tests in CL topic Change-Id: I437695ca42e42c84a9a3027d9314a7f7175b978d
ae957a780e