Merge changes from topics "api-address", "api-change-ike"
am: bedcf85eee

Change-Id: I42ab02f3c001638b90100123d667360ccd2849fa