Merge "[bootable][recovery] fix -Wreorder-init-list" am: 0d76cad830 am: 843c0bbb01
am: bd99b40ae9

Change-Id: I199600ff980e87bcc4d2bb2078ca4a43f3f9ee32