Manually merge changes from giant AOSP topic

Change-Id: I7446e2aaddc1c611518fa11cea2a049848030f40