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

Change-Id: I1e2d98073fcbb2b84ab3ccb3eef01f0fdd8c9a99