Merge "cameraserver: fix minor typo"