Manually merge changes from giant AOSP topic

Change-Id: Idadac0e271d42e34be9ff8f9297121cb83223953