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

Change-Id: If8daf7f2f2e1b6d688050c4543d2648320bb21ad