Merge "Use InvalidArgumentException in ActivityUpdateJob"