am 88b4f433: (-s ours) am aaf02e00: am 54e3e974: (-s ours) am c3fe47c9: am c28caf53: am fe7dc301: am 45507172: am 0bc1ffaa: Merge "DO NOT MERGE Convert the scheme to lowercase" into jb-dev

* commit '88b4f433599ec751d278cd97925f7fffcb2e92e2':
  DO NOT MERGE Convert the scheme to lowercase