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

Change-Id: I4afed0610dae08ab3bc21529a4c104e87dba0d41