am f18ed45f: Merge "Fix to work statusbar configs as mcc/mnc" into mnc-dev

* commit 'f18ed45faf24fdc45ce7c158d46d8ab25d39a6e3':
  Fix to work statusbar configs as mcc/mnc