Merge "Changed the virtual ids on ContentCapture to be long."