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