Resolved the build errors occured from previous commit.