Merge remote-tracking branch 'toybox/master' into HEAD am: 4be718d62e am: c3095b883f
am: 108c110427

Change-Id: Iaa8ccc9fe0bb05a53befab7105b841c37eb26e7a