Fixed bad merge

Change-Id: Ice17b709a0936a90e1aab5a4660c2c24569ad571