Merge "Address review comment."