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

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