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

Change-Id: I80107b04678e61d1fc356dc7e6efe1a875a7f7c9