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

Change-Id: Ib039f6836210863337377f22d977526e717659ae