Test: Treehugger Bug: 112657134 Change-Id: I9e2e0348b8e0e9ac473db354023a242087fbb2c3 Merged-In: I9e2e0348b8e0e9ac473db354023a242087fbb2c3 (cherry picked from commit bdc5a733)