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

Change-Id: I6578e6446b411e93af01e8883dfb7fd02892493e