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

Change-Id: If33bc7e850807d3fbf6eb5ac7ba6208cd647323e