Merge \\"fs_mgr: validate corrected signatures\\" am: 4824e794b2
am: 270531fb49

Change-Id: I74fab8180035b4aceedf3d531be5b7ddb58eb19e