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

Change-Id: Ie14854bfa3c1a616f16382dd7a7c0578ab04fa08