Add 'else' operator for 'if' with blocks

Change-Id: Ie93952efdd89e6f2f2dd54bb296cad721f54bad3