Merge "Update handle behavior defaults to updated POR" into qt-dev am: 8c15e2c8ed
am: 412bc08349

Change-Id: Ifdc5457a91738f828fbf32fe0cdcd6c93ff0b4d9