Remove redundant methods and add new ones.

TEST=None
BUG=chromium:232218, chromium:232226

Change-Id: I0d4f2fe8a06e76af145ddc00de14639ea916227e
Reviewed-on: https://gerrit.chromium.org/gerrit/48600
Reviewed-by: Kris Rambish <krisr@chromium.org>
Commit-Queue: Deepak Gopal <deepakg@chromium.org>
Tested-by: Deepak Gopal <deepakg@chromium.org>
5 files changed