Merge "Fix occurrences of "-Wextra-semi-stmt""
am: a4c86c5504

Change-Id: I0a4dbfa7055dcd5b04f0af593fa3c7a1f94c89fe