Merge changes from topic "handle_per" into rvc-dev am: 78688bc4e5

Change-Id: Id40d62d5469ca9f93a9c3db310a192729a40ce7d