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 am: 6a7c6a24a7 am: e8b48abb02
am: a23674b4f9

Change-Id: I1071a79ff62a800027c5da1ffad9401e83f541b1