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

Change-Id: I9cf88ab989a4365c15cc3a48aa446e1452e3efe0