Merge "Remove one foregrond service restriction." into rvc-dev am: af003c1009 am: 58d02e9ba5 am: 104d3651e9

Change-Id: Ia7736a3629cdd29abe512e038601241f8ac1fbfb