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

Change-Id: Ia0cade51fde9d7bd89ea13c7d69820f490114bab