Merge "fs_mgr: removing __BEGIN_DECLS and __END_DECLS" am: 85b80dc18d am: a4b15d7e2c am: c13381d680
am: 5bcacab65f

Change-Id: I5273783cdf84cca84084bb9b3513d68bef2af203