fix merge error

Change-Id: If2013281377ab5456f997b3c271464ee65341a18