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

Change-Id: Ie495df29d6be1a813c13cce19ade9b21fdb8057f