Merge changes from topics "api-address", "api-change-ike" am: bedcf85e am: f3f23c9b am: 702d1e27 Change-Id: Ie0f9bb0e7da1a6e03288fb3e65e7572a56087714