20e268c496
The function returned a tuple but the second returned object was always ignored. The patch also deletes redunant unittest. TrivialFix Change-Id: I85b3b9a58c8d07aa6bbce240d22cceccbb8a7588 (cherry picked from commit c5eaef9c55073f5ff12b348f4b0b375bcd83590e)