Manually merge changes from giant AOSP topic

Change-Id: I31829b5aab2a355d1093d51cef006b0277f3fe32