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

Change-Id: I731f17bdebb326d8d707e56d94421d6070e2e63e