Manually merge changes from giant AOSP topic

Change-Id: I4cfb7d659fd404b4e0a3c4809eacf200fc452df4