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

Change-Id: I99800fbfda8d0c9ce1b4cfb5dc2b39f51995a50c