Merge remote-tracking branch 'toybox/master' into HEAD am: a1ce46baab am: da5a402a93
am: 0f3ba9ca9a

Change-Id: I58dbb26b3f22744f92e908508997acf15a4a4f08