Merge "Rename casefold/projectid properties." am: 9d0508a854

Change-Id: If27cbdd3df8bb53b8e27a772be9b0826a8fce4e4