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

Change-Id: Ifcffe984c4e2cdca85d800300d80cf6dfea5af0b