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

Change-Id: I2d9a87c927142612d498e38a47f61cb3401842d9