Merge "Don't throw RemoteException from new NLS APIs" into nyc-dev