fix after merge

Change-Id: I752acb69197e46ae75fd71aa06abdf9f16e1220f