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

Change-Id: I469c96bc55ae86b46c9a5ba00707eb4c122868d1