Merge "Changed null checks in Passpoint APIs to return non-null values"