Merge "fstab: remove length parameter for encryption" into cm-11.0