Merge "DO NOT MERGE Convert the scheme to lowercase" into jb-dev