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

Change-Id: I547c2cc2e55c8a6bed073f84a6baca425e115ae0