Tweak mount options +James Dean

Change-Id: I2b64adb67b7585ba529f7839709f749cc656abbb
Fix wll compatibility fix

Change-Id: I12e2c7f09aa07a3caf222c19a2428806b02735e3