Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: Ie5951a8dcc528deee5a37b73e556100c32962fbf