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

Change-Id: I7bc7dbd93d4227715c572e31025bb16d49356ab8