Merge changes I24ba9196,Idc983746

* changes:
  Fix some l18n issues
  Add more info to log statement