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

Change-Id: Ie0163d2a6ec0e58d7de3557057938983b551b177