Merge "Add override specifier and member constness to RecoveryUI classes." am: d6fb1c6367
am: 2e20c11828

Change-Id: Ib467bf7ae8a7a581617cdd124c3803a5aa631031