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

Change-Id: I7c3b24d7ced5b2b7f468a03c2caf85f66e881301