Merge remote-tracking branch 'toybox/master' into HEAD am: c5a1dd459a am: e71581dbbc
am: 3c1a8f8004

Change-Id: I2b4f28e9ce86d10410c6153f1193864912a848f9