Merge remote-tracking branch 'toybox/master' into HEAD am: f353b240a5
am: 66859184e5

Change-Id: I23b47ac02e42705de3dca793d2125a2c8b86ca22