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

Change-Id: I9e48e039a5d33d80feb1320863148dbebf052c6b