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

Change-Id: I9d21ab285810d4c218ff0854b98cf7fc0d555236