Fix incorrect code after merge

Change-Id: Ifea7c3737d6d6cf981a87216b1b84f1738ed5685