DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e  -s ours am: 3280efe50e  -s ours am: b737365553
am: 3d1931d4e3  -s ours

Change-Id: Ieb19904cf060072d2525836ebba9f310da515b4b