shamu: remove discard in fstab am: a02879f0e7
am: 40960fff36

Change-Id: I91b6ef88c0fdaa13135e23eb9fe90926f8b58659