Merge remote-tracking branch 'toybox/master' into HEAD
am: cae4495189

Change-Id: I55523be9cfcc8f135549fce7bd11bbe05ac0b5ed