Merge "fs_mgr: remount reboot if overlayfs got setup" am: 842cac88e4
am: e184fa6777

Change-Id: I3d68247626443f0860363a6345ffba737fc6d803