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

Change-Id: Ibb56d49b198ca37e38053392f744c9f0128910d8