Merge "Sync with upstream 95647bc8:"