Merge "Changed activity --intelligence option to --contentcapture"