Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev am: 952697b8 am: db8281ff Change-Id: I56a1bec995f2d94b4a417a1a2662da8c9f2ae069