shamu: remove discard in fstab am: b76d4112b9 am: a8bb8a6fac
am: 11ba08108b

Change-Id: I38d9892b5b8f6bb13b9cfcc9a717a7310b28f83f