Fix compile failure due to a merge error in 4adad0bc1f508360999de176048f89025ce84b3e

Change-Id: I7aa013e99c1f20c4f62299a5fa65dc7db65bf386
1 file changed