Merge "Remove unused methods." am: d96e802dae am: 09cccda109
am: b96b18fab1

Change-Id: Ib57c1d7a3a80122bf3f968ad13f8601a6bec25b0