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

Change-Id: I7b3a9548d35e2347f0a1a935b1e23cfacc2195bc