Merge "Correctly report the transparent region" into nyc-mr1-dev am: f05765e3c4
am: 52feb6b956

Change-Id: I746a21537ec34285fda505a5919740ab04693b3d