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

Change-Id: I57ff9495d95a06e783035227417138fc810e13d9