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

Change-Id: Ic1c7d46e93761700114946d2c9066c46221053e1