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

Change-Id: I4f488ad66305edfb5cbc61e1fc765e3d53172d05