Merge "remove encrypted filesystem code from recovery"