Merge "Fix minor bugs with tunnel mode implementation"
am: cb9cd96c50

Change-Id: I94210f595e904d13711feb97e77a3373d8cce1b0