[automerger skipped] Merge "Automatically set IPsec tunnel interface as up"...
[automerger skipped] Merge "Automatically set IPsec tunnel interface as up" into rvc-dev am: ef5732b0 -s ours am: 033d06c0 -s ours
am skip reason: Change-Id I55b63a748463a388e1e2991d2d5d6b3023545e60 with SHA-1 d78ad3d4 is in history
Change-Id: I8e5cf4b83f05068ca2715b9715204af268320ca0