Merge changes from topic "multipath-datausage-backport" am: 61fe8317c7
am: f131243d63

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