Corrected merge conflict

Change-Id: I9e2a57b838cda985073494acc33d149d9d1efd41