Manually merge changes from giant AOSP topic

Change-Id: Ib64f9a5480b83acb2ef855d5c45a7defcdd5be8a