This reverts commit 782b752889. bug: 308932171 tested: locally generated and applied ota on nonab device Change-Id: I67b26be01d6240b2cb332e13bc7c7959de128755
782b752889