rework mount order and flags

Change-Id: I90b4bfcd754f66c53cb65e87a93f6ecfadaf0170