Merge remote-tracking branch 'toybox/master' into HEAD
am: 5e9108a442

Change-Id: I836a48996548b7c2193f122e5ef1df13c76f36f7