Merge changes from topic \\'stune\\' into nyc-mr1-dev am: b646ec13e1
am: 6ab97e587e

Change-Id: I92ed34e44dd8ca7fe430a8ac1931e57fd10c2070