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

Change-Id: I22ec2b8b3f1a978442fd5f7031a35eba8cb9ce25