Camera: Remove merge artifact

Change-Id: I5817d9f2a9410ef6ba4f5f0242406b410afbf0be
Merge remote-tracking branch 'pac/pac-4.4' into pac-4.4