Merge "Resolve ambiguous argument." into rvc-dev am: 6738abea am: 0e19591b am: 6420a3ba am: e669e830 Change-Id: Iac63fc27acf943ee59eb3313bff4f16bd105feca