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

Change-Id: Iabf046987aeeef1d866415ae35bff412c52bf29d