Merge "Fixed compilation error in Eclipse."