Manually merge changes from giant AOSP topic

Change-Id: I0808da42d7c2bfc4b81d1ece18a34f7605ca5f79