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

Change-Id: Icf243ef1fcceed4281f8491bc90f668fd65f3979