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

Change-Id: I0ed93b5533758282206e0b741e8eeec36a9619f9