Nontranslatable strings; Fix compiler warnings

Change-Id: Iebcc32f3b2471972e6289f75aa659ba93fbb8739
Bump Minor version code to v2.05.000

Change-Id: I97d2d824963a2333ed03f26a69b7098ddbb7a212
Merge changes I97d2d824,Iebcc32f3

* changes:
  Bump Minor version code to v2.05.000
  Nontranslatable strings; Fix compiler warnings