Bug: 133244926 Test: Treehugger Change-Id: I09b0127ce929ec51fbb5c387c383e76dcde5f0b5 Merged-In: I09b0127ce929ec51fbb5c387c383e76dcde5f0b5 (cherry picked from commit 82cfdba1)