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

Change-Id: Id5e655e6beec5bd291a8f2b53987d646b1f54f5f