Merge remote-tracking branch 'toybox/master' into HEAD
am: 11385503ee

Change-Id: I901afa0deb4ec639315342fd0526987a87972530