This reverts commit cdb855bd. Bug: 36130225 Bug: 67670457 Merged-In: I9f2ba9a9b10fc149d567f19ae8feacf2f1e1df27