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

Change-Id: I111760a61b029d81b24eeaa332a951558173d002