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

Change-Id: I3026ac829781f659b2478c917aca6639bb6abbfa