Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: I0e66b038cc5e409bb5c47dd851d37efc98e4a356