Merge "camera: To fix compilation error in Mercury." into msm-3.4