Manually merge changes from giant AOSP topic

Change-Id: Iec1a4fdf7f5e04f091608f148aa770cfcd5f8acc