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

Change-Id: Idc3b23df9b087b578e8904139aefd09a49fce84d