Fixes: 160698434 Test: atest WindowTest Change-Id: I15d74c83daad3206c6f3fc4f6a3f082d20d3c769 Merged-In: I15d74c83daad3206c6f3fc4f6a3f082d20d3c769
Fixes: 160698434 Test: atest WindowTest Change-Id: I15d74c83daad3206c6f3fc4f6a3f082d20d3c769 Merged-In: I15d74c83daad3206c6f3fc4f6a3f082d20d3c769