Camera: After merge fix part 2

Change-Id: I23fd14eea0821555ca24780075548f3385ddc7cf