Merge "Ignore case when checking if a given path contains mount. am: 762bb252fd am: b3247b78d9" into rvc-d1-dev-plus-aosp