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

Change-Id: Icf1f8bf67f2c93c9157616cada7905e468d58948