Merge "fix implicit declarations"