Manually merge changes from giant AOSP topic

Change-Id: I658f8f515c4fd7fe567869d8ce145b6f53081ffc
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.