Merge \\"Fix clang-tidy performance warnings in fs_mgr.\\" am: 44c909d467
am: be25035ddb

Change-Id: I28d4715c53f0320ebe6052f7ee269082b04a8da2