Merge "camera: Update for enableZsl values in template" into oc-dev
am: 68d06eae7f

Change-Id: Ib3ac2301b35f33f7ef715c054534136b456605f4