DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff
am: 96fe6421f6

Change-Id: Ia2ce3f8b95b578253c5336407ae85880d3d317f4