Test: TreeHugger Bug: 162993824 Change-Id: I2336a0c2bf3f71cc0b0bc1ef491a1043e88f359e Merged-In: I2336a0c2bf3f71cc0b0bc1ef491a1043e88f359e (cherry picked from commit c74d7163)