Merge "Remove extraneous semicolon" am: 5800125e5c
am: aa47f72421

Change-Id: Ia3644c9a10263050a02acb4597ff3c4cad3e0597