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

Change-Id: Ib16c50de2a3846dae9736e7ca68a4282831f0812