Merge remote-tracking branch 'toybox/master' into HEAD am: f2fa082e9f
am: f291c6ce19

Change-Id: Ib96adcba0c0d7376307249cb01f78d081f7eef1d