[automerger skipped] Merge "Add IPsec tunnel mode feature flag" am: 86f2f55b86
am: ad1e0006b1 -s ours
am skip reason: change_id I6dd0e429cc0bd100f2ef1140a6651f6ef5294c79 with SHA1 dc92c69b08 is in history

Change-Id: Ic2d8d4d0a0a5cac20bdbb066dc104910060ada94