am: ea162c3c * commit 'ea162c3c': Prepare to replace windows across recreate(). Change-Id: I3f78aa81d76e0a71f616037c531e7755760b41cf