DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6
am: 9d99b0001e  -s ours

Change-Id: Ib0fb40f990138b3729b66bdb6d6a095bd3ad231d