Merge "Merge "Camera: fix more image copy/compare logic" into pie-cts-dev am: a1720f0e35"
am: 7b786256e7

Change-Id: I94b93131002674f992132131515c01074a558630