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

Change-Id: Ie5364d5617a159344d5232e48957ffd79a89a175