Merge remote-tracking branch 'toybox/master' into HEAD am: 60f116b00b am: fb20928d25
am: 190589564d

Change-Id: Ic71bf0008a81b441389692da798e1e68428b5d54