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

Change-Id: Id86543c6dcccd277c60139cb7ff08e6d862933fa