This reverts commit 6be3b0e1. Bug: 180949581 Test: atest odsign_e2e_tests Change-Id: I7a7dd5b475af4502dc9671d2dce02ee3673ddf81