Merge "camera: Update for enableZsl values in template" into oc-dev
am: 6bbcd2a35d

Change-Id: I35a5dea7747bdc2ed554b1c8e71624f2134eb3f9