Merge "Remove more semicolons at the end of namespaces"
am: d652a9e231

Change-Id: I9b75e15b47aada0b95a1364b907a83fe069f4242