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

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

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