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

Change-Id: I4e1f8b76f8bd04e64aebf3f2f90afb7d07f9e357