Merge "Remove unused methods."
am: d96e802dae

Change-Id: Icfa59243b99e75da293b558737a08aa1b2e78c21