Merge remote-tracking branch 'toybox/master' into HEAD
am: 4ab83f6960

Change-Id: I605c6cc8493cbfd4ff97a0c725a43ae1e01b8571