Test: treehugger Bug: 284530649 (cherry picked from https://android-review.googlesource.com/q/commit:f838816cb752b94d56eaba3674933d235b99e488) Merged-In: I3a55f52aa74d2743280288b21e6dfafa1064674f Change-Id: I3a55f52aa74d2743280288b21e6dfafa1064674f
Test: treehugger Bug: 284530649 (cherry picked from https://android-review.googlesource.com/q/commit:f838816cb752b94d56eaba3674933d235b99e488) Merged-In: I3a55f52aa74d2743280288b21e6dfafa1064674f Change-Id: I3a55f52aa74d2743280288b21e6dfafa1064674f