am 9da936a3: Merge "Remove the ext4 discard mount option." into jb-mr2-dev

* commit '9da936a3ef2290755ae3860b8f26999a343d6c08':
  Remove the ext4 discard mount option.