This reverts commit d9c809c480. Bug:72511998 Change-Id: I3be2374e3662fc8397c00f1df1bce6de5f5a4549
d9c809c480