Merge "Remove extraneous semicolon" am: 5800125e5c am: aa47f72421
am: 3deffa0791

Change-Id: I99c716f5dc1f50da228ad9a3e29672d83d13c26a