Merge changes from topic "vpn_data_accounting" into qt-dev am: b33d2ca2e3 am: dadc3c9da4
am: d79a417600

Change-Id: Ic29006bc5a20abd240e230b52f508e8a4e7c69af