Try to fix ambiguity error

Change-Id: I93cf7497e52d065d00f762f61f79a4e8f8609bfc