Merge "Use merged NetworkTemplate to query data usage" into qt-dev
am: 35fcd6b0e3

Change-Id: I1030f49eb9e24ad8bc4a10c3ab8890c34d20f8f6