Fix merge error

Change-Id: I619718509fc1ec72ce90cbf823ed274bfb1c65ed