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

Change-Id: Iaa931220d98b910738cdcb3b92d064bfdca44992