Fix merge error

Change-Id: Ie06419ba7edf8f9f255048c8e1fcffca379b3d17