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

Change-Id: I509bcbfc1215b09f0b4559397408a8e785395651