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

Change-Id: Ib98003dcf86beac37688496ef00543dd0922a3a8