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

Change-Id: Id1c5fa6a2253e8ff1c8d00c5eb553e813af89aff