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

Change-Id: Id8974b50d3d8640a544b81f7cc99e569371fd214