Merge remote-tracking branch 'toybox/master' into HEAD am: d94bd8e917
am: db6c38177a

Change-Id: Icec86477f8ea713f6d1044ac3c71081a69c3b42c