fix merge error

Change-Id: If324a0d30018802f157c300c8bc3ddec64d36c9f