Merge "Camera: Fix bug in api25test-EnableZslTest" into oc-dev am: 876c6a900e
am: df60b232e3

Change-Id: Ib480e0a26f7a333eeb55d21743608867c1ad4423