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

Change-Id: Ia138161fc582f0097c6ecd543ef1d0783bec7dd5