Merge "Changing apk name in the manifest and the corresponding packages." into tm-dev