Test: Treehugger Bug: 151241308 Change-Id: Ie611320f4651b83e0ced6f5c8fede34a8a0a41c1 Merged-In: Ie611320f4651b83e0ced6f5c8fede34a8a0a41c1 (cherry picked from commit 1e154a34)