am 86596342: Merge "kill OS_CASE_SENSITIVE"

* commit '8659634285d29edbbb364277f5950f41e26a15d4':
  kill OS_CASE_SENSITIVE