Merge "Requirement from EIS team" into camera-SnapdragonCamera.lnx.2.0