Test: treehugger Change-Id: I1900272e488ec64039a3734ae157d26d242e52f6
mentioned in commit 8805867b
mentioned in commit 03785267
mentioned in commit 9fc74831