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

Change-Id: Ie3a36500aa1901be8a8d9094c45ee6af517e046f