Merge "Remove full namespace in header file."