This reverts commit 1b11aaaf. Bug: 128529256 Bug: 127406460 Reason for revert: Breaks FSI Change-Id: Ie9775779cda7b376c36493f3ce3246eafc672c59