fix merge 2

Change-Id: Idc0e950976bf1124a50c2cbb33c37864262549b8