Test: treehugger & atest locally on flame Bug: 145573317 Change-Id: I9641a425b46abe775a21f1014f6f236586dd4c12