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

Change-Id: I51c5bb17bd2dc14ad832a5f76dba90f859c33d9e