Merge changes from topic "fs_mgr_unit_test" am: 6d6ccdf7c6 am: b45e01bdd3
am: 9dc08bd409

Change-Id: Iae86306d7f8a174d86b94ff8a15eb16764ddc991