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

Change-Id: I1bb34dd7a1269421b1b54f3cbaf12ca91489804f