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

Change-Id: Ief5b3e5e09340c03048048511629f4af38ee16b9