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

Change-Id: I32307d7b629f0e227b4536d873edf1b9693437be