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

Change-Id: If7e422b1a5e7f8b94d4f338412025aa7ca526a09