Merge remote-tracking branch 'toybox/master' into HEAD am: a379d5ee15
am: a4f4fa78eb

Change-Id: Icfa74ce051e6151fc206329884311e54adef8021