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

Change-Id: Ic9982c15351008ff686f9bf395ae8f3b4adcdb30