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

Change-Id: Ia7bf4d6991be15c732ba8b55c37f2c9e447b1dbd