am ab888c4e: am c65c11dd: Merge "Fix expected results in implicit conversion tests...