am ea6cc9a6: Merge "Switch from switch to if-else to be compatible with the new ADT" into ics-ub-calendar-aqua

* commit 'ea6cc9a63ac8a7c7389dfa065c9af51619547a8b':
  Switch from switch to if-else to be compatible with the new ADT