Merge "Added system_server to system group" into oc-mr1-dev
am: 22d055566a

Change-Id: I0b6deacd471b2a6c082cb2cc916e8ee577045c9e