Split given statement into several statements

Change-Id: I7f4068bfe52029c20f95f90710e2b69c0e648dec
Merge "Split given statement into several statements"