[INTERNAL] fixed syntax errors found by fortify scan

Change-Id: I9de5b6c7940f8080ef2fb5cacf3d4ba11adc3c8f
Merge "[INTERNAL] fixed syntax errors found by fortify scan"