Merge changes from topic \\'stune\\' into nyc-mr1-dev am: 4b75a86858
am: b8a19f4499

Change-Id: Iecdd4d4693534640aef408f40aa3fd1e1fa9b93e