Merge changes from topic 'rename_wifi_hal' am: 73e6598317 am: 5a225ae795
am: f0f7b191b9

Change-Id: Id9b7ff5d87c9cfbdb00f5d4fa1ec5abf5772656f