am 31d157ba: Merge "Fix bug in enabling/disabling SMS cell broadcast activation." into ics-mr0

* commit '31d157bad27e4ecbe415f6f581946b6da7cc2ba3':
  Fix bug in enabling/disabling SMS cell broadcast activation.