Merge changes from topic "multipath-datausage-backport" am: df984fae26
am: c46c21c702

Change-Id: I45f0c69e3440e9ec69c82e81c41bea682a359389