Merge "Merge changes from topic "handle_per" into rvc-dev am: 78688bc4 am: d0e0a688" into rvc-d1-dev-plus-aosp