Bug: b/74026074 Looks like this CL is not the culprit :( Apologies Aart. This reverts commit 7f31326f. Change-Id: I15830324bb276129bf44caf232af24d7c022ed9a