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

Change-Id: I69a04951b0d27c7c3fa05ef51278fb2087851488