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

Change-Id: Ifa85ce6790aef1838c29d521b3fdd23d7e8728d7