jf: insidesecure vpn: goodbye

Change-Id: I7a6a2ba068a13a6371636c2fb5f60a485284d7df
Merge "jf: insidesecure vpn: goodbye" into cm-11.0