Merge "Remove extraneous semicolon." am: 83098b6d45 am: c77ecb78b5
am: 0153ef740d

Change-Id: I6397aacbf3e5771644874cd857fcf82fa76706cd