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

Change-Id: I28c0f3cf75c1e225b3d24b77934d055dd9edf854