Merge "recovery_ui: Remove redundant menu creation." am: 0ad3ec03e4 am: 9b57172706
am: 18de138abd

Change-Id: Ic584d1b5a8fb8cb29b439472d6ec945a582a7d46