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

Change-Id: If2c5d67842d506a82754b3af71d46be62569384b