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

Change-Id: If21b4f8a327f584912c9021d9792031e6d79c065