Merge "Resolve ambiguous argument." into rvc-dev am: 6738abea am: 891fd1e9 am: 0e80dd0f am: 5b4244bd Change-Id: Idbd10d7fb0f5a1c676e0d13128beea06fc5ac0c2