Merge "Use tunnel local/remote addresses in security policies"
am: 8424a78b75

Change-Id: Ib245f56807848a7908aca80b2f080073600a7722