Merge "Formatting RecoveryUI related files." am: 8e7db8f4a6
am: 076aba3d8a

Change-Id: I6a16dab86d41026f7a2501a3ee7601ae97c5dd72