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

Change-Id: Ia1dd7b136236ebdcd854e4d5fe0b51276e48536a