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

Change-Id: Ib0d8d4f3a27cf8c04e77ea0cadfaacee1f02c7ed