Merge "Revert "Handle case when snapshot dimensions don't match"" into oc-dev am: e7ac324c71
am: 79f56babd7

Change-Id: Ib7bba216d53f911993a4afd01e0c77761dd45f89