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

Change-Id: Ie4550fa038c6455b007c694a7626c842ec0991bc