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

Change-Id: Id34d998fd3ed61559faac301b94e16fb95f13f2f