Optimize mount options

Change-Id: Ibff1e838363f37f90db6d3f448e5f90531e89348