Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev am: 952697b8 am: 2d4f0566 Change-Id: I72c485cf9f490368f5903f11f2f14d8770f3a000