Merge "Use getNrState() system API instead of @hide"