Merge "Fix JE in RemoteFillService."