am ad37305e: am c51aa3bd: am 69625548: Merge change I239e9f26 into donut

Merge commit 'ad37305edb98df08d71fd27e7d1df6a082a76da3'

* commit 'ad37305edb98df08d71fd27e7d1df6a082a76da3':
  Bug in Mac build where it gets confused over case, fix no longer needed.