Merge remote-tracking branch 'toybox/master' into HEAD am: 11385503ee am: 4077f75055
am: 3f3dde2e00

Change-Id: I9041878f64c292435075982eba8cb99bb9628943