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