Merge "Camera2: Fix metadata unit test failures"