Merge "[hardware][interfaces][wifi] fix -Wreorder-init-list" am: d1785cb7f6 am: 7d36ef505c
am: d654bac57d

Change-Id: I4db6c3642518d569ae6774575bda14533ca5623e