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

Change-Id: Ie0bea3ba0de34b8ef14ca4af97772530b6736dc2