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

Change-Id: I56fa43264767d49ca533822a1921d75e26b02b26