Merge "Revert^2 "Fix signature of recently changed methods""
am: 3a603777ba

Change-Id: I3997c82d48b94118a11928ec10e664acc6607fd3