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

Change-Id: I114bb6ce2f1425100b6ce84e383b8efc08b07340