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

Change-Id: I703e4ec03f0eb2a5a215ac07407e094a92f0d161