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

Change-Id: I18434571c3140be3402ad009bf998f123fe74d82