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

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