Merge "Drop unnecessary semicolon from end of file" am: 1101172876

Change-Id: If5f0c40772cb168d107c97d76e0a95d7a5343df8