[automerger skipped] Merge "Revert "Fix signature of recently changed methods""
am: 89a4b96b9c  -s ours

Change-Id: I4f5c4d87f419cafc44b6f93a24a29720db744d06