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

Change-Id: Ieb0c181854c036b4b1dfcb8aba7b68c5b4d3456f