Merge "Remove fs_mgr_wait_for_file." am: 0b5c3552cc
am: a5d1f552b5

Change-Id: I6997a247e125c98917fa439d9f240e161143fcea