Merge "recovery: Move a few int to bool." am: cbb2bcf541
am: b97f06a5dd

Change-Id: I406a6cfffe6bef144d31fb605cd572fd5df6d72b