Merge "Resolve ambiguous argument." into rvc-dev am: 6738abeabf am: 0e19591bb0 am: 6420a3ba9b

Change-Id: I95065ec6d7eec166c9c7dfad73c361b1db16c867