Merge "NITZ API improvement"