Merge "Enabled Content Capture in Service" into rvc-dev am: 018978b7 am: f9e3d049 am: 71ad78cd Change-Id: I969261b43b11d60a77de570b7914933e1344535d