Fix merge mistake

Change-Id: I8b23d408f64041772f38b62e1ee979126566fea6