Merge "Renamed Result to ResultCode" am: 093ab1dc61 am: ce29c3ecbd
am: 40045aee45

Change-Id: Idaf26a3cb64871637e10f84fe492a7d5bd706e46