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

Change-Id: I4a47f1f7f34cb4b52b57cc1533c90a2e0545845d