Fix last merge

Change-Id: I3c64e337b60612a987ba1471a31be75b07d8ab5d