Test: Treehugger Bug: 119144366 Change-Id: Ied6d1bd084b2632e72ef60bd96c8a1e6c9d1a16e Merged-In: Ied6d1bd084b2632e72ef60bd96c8a1e6c9d1a16e (cherry picked from commit bfde48f4)