DO NOT MERGE Remove window obscurement information. am: c3c2ed94 am: 96fe6421 am: 9d99b000 -s ours am: 3280efe5 -s ours Change-Id: Ia7bf4d6991be15c732ba8b55c37f2c9e447b1dbd