Merge changes from topic "handle_per" into rvc-dev am: 78688bc4 am: 34c3bae9 am: 2dd87eed am: 133e0448 Change-Id: If7760d475772308f81d7f79820152dc7414337bf