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

Change-Id: Icbe3f3c26cf65e7b12f5567a9bc40f7e0a3bd578