Merge "Resolve ambiguous argument." into rvc-dev am: 6738abeabf

Change-Id: I42d8dcfd819d21e87679746f50303adf378298cc