Merge "Remove "final" from ResultCallback." am: b60d7b334c am: 8df12d98f7
am: 8c5eb9b10f

Change-Id: I9a234d6176c441b424714dda1de4ec580a12e2c5