Merge "Change the multipath hint default to 0. am: d1e7d3d73e am: 9620595965" into oc-dr1-dev-plus-aosp