am 2649c58b: Merge "Avoid self-recursion if client calls init() from date...

am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev

* commit '2649c58b':
  Avoid self-recursion if client calls init() from date listener