This reverts commit e1713e60. Reason for revert: b/294185369 Fixes: 294185369 Change-Id: Iaeef3423e67da3ee3a5a86e231e2bfb6fef759bd