7ca46ba2ee
Fixes: 139416391
Bug: 135218095
Test: echo 'in TreeHugger we trust'
Change-Id: Iea89b3d379792327657e01869c9494975e7b0306
(cherry picked from commit 214a45ee02)