Added statement for ... if ... else

Statement for ... if ... else was insert where it possible.

Change-Id: Ic74d9c0a9e7de597c22f72f5cef3c01ea5fd87a0
Merge "Added statement for ... if ... else"