Merge "Remove extraneous semicolon" am: df93a64586
am: f944bc32e1

Change-Id: I664318ec1f3b3291204d67647b4349936772f7af