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

Change-Id: I0eb171f19d30d818f4b856f164257c993a871ae7