This reverts commit d14320d21c. Reason for revert: Removing method again and will make changes on internal to prevent breakage Change-Id: I41cb918df90a203fd6a03f4b51464300de9428f8
d14320d21c