Manually merge changes from giant AOSP topic

Change-Id: Ia693a98a2713bcff5e59e484a8a2fc0d13c96700