Merge changes from topic "multipath-datausage-backport"
am: ae0d925470

Change-Id: Ic29d71ade161434b6dea796a887f60b5587ca1d5
tree: 86860039cf1b8a24724991f4455ea6ca65f123a8
  1. core/
  2. services/
  3. tests/