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

Change-Id: Ib0b86bedbf7b9a4370533847ac0acad5aa478795