Merge remote-tracking branch 'toybox/master' into HEAD
am: 9d0d755783

Change-Id: I5a66e9d66758a3272e5dac219dc563f7ffc6968a