Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am: d118826971
am: 6d3c10495e

Change-Id: If826b05dea2d3c14137ee5e34449b6d39af6cc10