Manually merge changes from giant AOSP topic

Change-Id: Iad4005a9a269a139173f85571a777def64cf4936