Merge "Sync with upstream 41655e1c:"