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

Change-Id: Ib01072a4e37fd78025bdecffe20b5b1fdf6620fe