Merge "Sync with upstream 643521d:"