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

Change-Id: I94da11cc4f382fbb0dbaf92b606ae2686c42b7be