base

Several code quality improvements

* Added GuardedBy annotation.
* Fix a misleading variable name.
* Use anonymous namespace to reduce namespace pollution.

Change-Id: Ieffbb8dfd6abbb24b705445659fb96f7ce861592