Merge "Add Platform.CodeName to source.properties" into jb-dev