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

Change-Id: Ie336c7c3968dd8cbb2b303398620632681d516b6