Merge change 10322

* changes:
  Text specifies "android:codeName" which doesnt exist, should be "android:versionName"