Merge "[automerger skipped] DO NOT MERGE - Re-add ContentCapture support from...
Merge "[automerger skipped] DO NOT MERGE - Re-add ContentCapture support from standard SDK toolkit. am: 911cb1fa am: 3fe70c6a -s ours am skip reason: subject contains skip directive"