Merge "Address the warnings in recovery code" am: 4577dff5a0 am: 03abec6ecb am: e681626afa

Change-Id: I72e44c8d1fdc6ed84ed48a9221b9eaa5df7bbd15