Merge "DO NOT MERGE - Wifi Passpoint API change" into lmp-preview-dev