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

Change-Id: I2034eee62a46862ae2c1a204787af537c17ee438