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

Change-Id: Iffded943f8814d22bff3c082ee619623f53be479