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

Change-Id: Id3b82ed12c8b6cfd39aae00fd45fdfcd3d0d3dea