Merge "Addressing error-code propagation for remount service."