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

Change-Id: I8e6633c9e36b95313145669b3012cedba572dbc0