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

Change-Id: Ib8bc739a3c5c68f426ff4aef793050db4a10f4a4