Merge "Support casefolded encryption" am: be27975fff am: db35eb2c53

Change-Id: I648288ddce8bf6a97f10a6ea7e3f74ab0e56fd77