Merge "Support casefolded encryption" am: be27975fff

Change-Id: Ic5d84fb0c33f612d486358b2c4b780069a6eec10