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

Change-Id: Iba8e51e0b6f1a02d2c80368c68d65dacf1029ea7