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