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

Change-Id: Ia7c0ed474f11fff8d8a25cf72e406599c4c3789b