Merge \"Put mediaserver and audioserver in the foreground stune group.\" into nyc-mr1-dev
am: 1161d40421

Change-Id: If674e88572c53317ec22646cc6546c32a9980d17