Merge "Resolve ambiguous argument." am: 486a8664 am: 00df02f1 am: 12e651f3 am: 76a9b6e0 am: c657bdf2 Change-Id: I5d7deea82d7114fa38f37b90f94fe7e6073bd848