Manually merge changes from giant AOSP topic

Change-Id: If45f592f906bf83817ec88cc8d16417f763f10ca