Merge changes from topic "handle_per" into rvc-dev am: 78688bc4 am: 34c3bae9 am: 29b55c1f am: e9825eee Change-Id: Ib282876b9bde8e8f5b071a3d28d5692d898a3387