Merge "Use INetd Constant for IpSec Interface Prefix"
am: 05a16e8a04

Change-Id: If5a0507e6aa2dfa2af7c69d1ec26ff9b48f3baf7