Merge remote-tracking branch 'toybox/master' into HEAD am: ccb4be08fa
am: cda243a505

Change-Id: Iff1c778e90368bdda4372d40d3094d0a50ef5685