This reverts commit dfe291b72b. Change-Id: I82e25fb7e46a679d82d89fd5f56e4f334b593f69 Bug: 69498268
dfe291b72b