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

Change-Id: I3142f4b13683f6189e0eccd155c36c0b65f3b820