Merge "Fix snapshots for secure windows" into oc-dev am: bf08eb6da7
am: b928547fc5

Change-Id: Ibc89f418354db1c7bdd57a9ee3b584570354bff5