Merge "Remove "final" from ResultCallback." am: b60d7b334c am: 8df12d98f7 am: 8c5eb9b10f
am: 71dd757c56  -s ours

Change-Id: Ife1f27d91ed2975741d24bd3eaa0fda9d41e1bfd