fstab update

Change-Id: I52e19a4491779262b8a3e65f1494cd372a59f98b
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0