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

Change-Id: I8e69619b347cad6a18d5f5c1d620b906da099e54