Merge "Enabled Content Capture in Service" into rvc-dev am: 018978b77c am: 986d742d83

Change-Id: Ib66ba539f340dc1d41e544b04afb22c86b024fd7