Merge "Remove extra semicolon at end of namespace"
am: 1d2bf45b55

Change-Id: I7209341dea742dc1cdcb2743462b875e95caed10