Merge "Apply new device ID access requirements to getNai"