Merge changes from topic "multipath-datausage-backport" am: 1afa23dade am: c46c21c702
am: d1e9c2795c -s ours
Change-Id: Ib16c50de2a3846dae9736e7ca68a4282831f0812
This commit is contained in: