Merge \\"Add support for background stune group.\\" into nyc-mr1-dev am: 531bdd5a2c
am: b386d72266

Change-Id: Ib0e2efeef7e015e0e8244e29a825bf3da50297a8