Merge remote-tracking branch 'toybox/master' into HEAD am: 37852b74a7 am: 6e78ae7824
am: b07116cee1

Change-Id: I9eaa38d5f984093d8fc90c6bd6e9241fb5b1ba8f