This reverts commit d7f8f942. Reason for revert: causing b/35349518 Fixes:35349518 Bug:35258051 Change-Id: I5233bee6696f76313868bb36fd0da4225e5ac038