Merge "Wi-Fi/NAN HAL/service fixups" am: 7f1c9647b8 am: cc195e0c67 am: 2ea0959e5c
am: ab42f95376

Change-Id: I933127293e1d7eabaf507eb1c08ac5ca5a5c6127