Minor code style changes and namespace fix

Bug: 35329090
Test: recompile, no change of functionality
Change-Id: Ied3ec7d95ce29896e8bf1851b08345da74bf8299
4 files changed