Merge "Fixed an illustrious NullPointer bug on Wifi Assistant" into lmp-dev