Remove 'google-build-namespaces' errors. am: 4905cf2411 am: 04bd27cab4
am: be4c8b2208

Change-Id: I49ae3543cc309e74e67170c1b51e76645d39f721