Test: TreeHugger BUG: 78245952 Change-Id: Idec61d9c23e8108226bcf668b4e498493e578b0d Merged-In: Idec61d9c23e8108226bcf668b4e498493e578b0d (cherry picked from commit 863b9371)