Merge remote-tracking branch 'toybox/master' into HEAD am: 60f116b00b
am: fb20928d25

Change-Id: Ia5504f0cc2d353cb8cb55fc00ba48b601d1e6b2e