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 '54e3e974aace59a4abae6257eef1f17bfb485618':
  DO NOT MERGE Convert the scheme to lowercase