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

Change-Id: Id6792ed416b7aac7a9d07276c053befd54c2df04