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

Change-Id: I5ee7ea4dcebf66781d3488f7af4f2b644e19caf9