Merge "Camera ITS: Fix its test_multi_camera_alignment failed" am: bdebb06347
am: bd3f279f76

Change-Id: I3d7faea457e2d5dcc721f18a34a0f13db31b4073