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