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

Change-Id: Iefe42ee7a2b54ddfae8812448b49301e5b5de92c