Merge "Fixed an issue where the result wasn't set properly" into rvc-dev am: 3bc4523adc

Change-Id: Ibe6662e3398436dd178cb5054106988a29e55da0