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

Change-Id: I375324a937478c584e95cb6550d98293162656fc