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

Change-Id: I639af88916cf4ca5607e7f8ae513e4777705c889