Fix merge error

Change-Id: Ieb0398dc393eadb1defdf276208bf39c76ebc1e7