Merge "camera: Bump device version to 3.5"