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

Change-Id: Ie8296ab28983a463cabe2c6b3bf1a0bfee6127d4