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

Change-Id: I4d213aa23c3c26ab9a19c69090dd032afb454321