This reverts commit d209586554. Reason for revert: Breaks the build because it removes an unused method that was used by a change intervening in the mean time Bug: 136143444 Change-Id: Id3a17e0b16ec03276609ca96fb7b582188ed1077
d209586554