Bug: 64692057 Bug: 71853552 Bug: 26687569 This reverts commit eb0ebed7. Change-Id: I7daeaa077960ba41b2ed42bc47f17501621be4be