This reverts commit 979c2da418
Will not be necessary after I22bc777b is merged in core.
Bug: 49074
Change-Id: Iac9e78b845c270cbdf36e982d5c7feb697e39a9a
This reverts commit 979c2da418
Will not be necessary after I22bc777b is merged in core.
Bug: 49074
Change-Id: Iac9e78b845c270cbdf36e982d5c7feb697e39a9a