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

Change-Id: Ia9a276d0b73e1264cd3e6275b6aba74b7d439bbe