Merge "Fix the build - change a reference to a namespace specification"