Merge "shamu: remove discard in fstab" into nyc-mr1-dev am: 2328f598c0
am: 5b7b6992ba

Change-Id: I00a8ce8520d53829eb1c039d758d2df95b567df9