Manually merge changes from giant AOSP topic

Change-Id: I93f58ad31630d228c8f5f82e054434254f9d586e