This reverts commit 304c52f555. Reason for revert: b/342971015 stability issue Change-Id: Id89154cd22db62d11df3aad19b3a674932f616ce
304c52f555