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

Change-Id: Id22f93bb9250f587c678a401fa57507784a58ebc