fix merge error

Change-Id: I4c100a4d063ab0464b2b128f608fdef98acf77ce
fix merge error 2

Change-Id: I4e2c638a9e2bc4a3427785df8ee19c9757063b84