Merge "RemoteException: more docs"