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

Change-Id: I4e3edff6e3ee9e67f94352a4b25abd352b89e1c6