Revert^2 "Fix signature of recently changed methods"

This reverts commit 29b92c610a61f88ebf25e764994b70d61bc3cea8.

Merge the CL again, this time without a Merged-In flag which
prevented it from merging into the internal tree.

Change-Id: Ie1b9de8c45cb174437fa4acdd78e6cdd4b660623
1 file changed