Merge "Fixed fs_mgr#fs_mgr_read_fstab_file_proc_mounts test"
am: 6b9971c55f

Change-Id: Ib1c90bd5c297e09e2de7487359c660a9c8a65aa5