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

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