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

Change-Id: I64871a60e8f2dbad6b43e9b1e16e53e3f01b56e3