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
automerge: 37ea640f
* commit '37ea640f':
Avoid self-recursion if client calls init() from date listener