Merge "CameraMetadata: fix metadata alignment issue"