This reverts commit 097d9764. Bug: 128529256 Reason for revert: Breaks FSI Change-Id: I44acd5ffafd5a29941e3ad5265a03fc78cd29369