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

Change-Id: I7fa5ec69aa4b485ba86ea99821680f4a99184f1c