Merge changes from topic "ikeparams-api-change" am: eabf5d707c

Change-Id: I867ee35f13f20a557bda343092229b3630f970cc