Fix RuboCop warnings about multiline block syntax

Change-Id: I96f3e90c35cbd081367b2b532851b310f9e410e9