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