Manually merge changes from giant AOSP topic

Change-Id: Ia7d52dd63ae081828ae5fe91af75e86c0ffd592b