Merge "Sync with upstream 95647bc8:" am: 20ad1ebc31 am: 7387ebee3f
am: a2f7ac0e95

Change-Id: Iffcb816bae771ed7c0c9f3c1b4b78259bc65e410