Merge changes from topic "vpn-meteredness" into oc-mr1-dev
am: 64c14793f7

Change-Id: If227c0d179137eea7d38c5f5579373268ae0bb2f