Test: TreeHugger Bug: 129712936 Change-Id: Ie1545f174017dbceab25a4e420c015230d74e97a Merged-In: I15f1db69de86ad8b9f2a0ae086fa2df87835948a (cherry picked from commit 09ecee76)