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

Change-Id: Ic08d492bfa09d39ca1a968e1fa9fc873f1161630