Merge "Only use simple rects for cutout region" into pi-dev
am: 4764921dcc

Change-Id: Icfb41008189d5c01f90afd4992428433043b4c4e