Merge remote-tracking branch 'toybox/master' into HEAD
am: fb3ebf8f5d

Change-Id: Ic5e554bd996172c794299b2626dff10af65c7793