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

Change-Id: I29c0c12ba499702296fa4c6f01d5c6dfde25ae11