Fix merge-misstake

Change-Id: I1680d8603ac44f500038433a675a3bd4189954b1