Code Cleanup of ResultBuilder.php

Change-Id: Ia0b9b5fcf6905adb418bb244e03aa7e8a25190e8
Merge "Code Cleanup of ResultBuilder.php"