Corrected merge error

Change-Id: I9a7f539f77461d161a32f25e5c2685b87bd42988