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

Change-Id: I2add91bb705fe680ddfe344118c4763d0d09bfd5