Manually merge changes from giant AOSP topic

Change-Id: Icd4e79ad36859d4d51438f385fd9b1a194943233