Test: Build by treehugger, code review as comments only. Change-Id: Ib072bf42c51af8e91ae7554097e839316956dea1