Test: TreeHugger BUG: 117242209 Change-Id: I60f30c488fc4d8cb7424a4e40071a25912a43d15 (cherry picked from commit a84ee805) (cherry picked from commit 14b5bcfe)