Merge "Renamed Result to ResultCode"
am: 093ab1dc61

Change-Id: I1dda97b48a3f5068fc001478b88190406f03d109