Camera: Remove merge artifact

Change-Id: I5817d9f2a9410ef6ba4f5f0242406b410afbf0be
(cherry picked from commit e9df37561c95d195d1d7f0eb8c9798f178ab24fa)
Camera: Avoid redefinition of ISO params

Change-Id: I5f283f6d3affb35ef6a24f00fdaac0ca8aa348ba
(cherry picked from commit 514a609b64d7af4171df9c15d66cde1bce68f625)