Test: treehugger
Bug: 124354087
Bug: 128024100
Change-Id: I3048625a2507e70402ce376e7208f58cdf5ddfba
Merged-In: I3d8cebec00dde7d0b61469f36887cd5afface043
Merged-In: I1fcb9ca292777fb017e9108a3e12cffba87e1985
(cherry picked from commit 2373c8a129)
Test: treehugger
Bug: 124354087
Bug: 128024100
Change-Id: I3048625a2507e70402ce376e7208f58cdf5ddfba
Merged-In: I3d8cebec00dde7d0b61469f36887cd5afface043
Merged-In: I1fcb9ca292777fb017e9108a3e12cffba87e1985
(cherry picked from commit 2373c8a129)