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

Change-Id: I0239cb6f76922638593fb471b8d53ca16c5279fb