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

Change-Id: I8a0d8e892ca8aa9ec84c33ead812701ccf67f7bc