Merge remote-tracking branch 'toybox/master' into HEAD am: 62f36d9160
am: 75bf2dab05

Change-Id: I2a047b2950230d982d76cd6939620837cb92a00d