This reverts commit fdca4cb5. Reason for revert: CHECK failure in device testing (bad checksum). (cherry picked from commit 4b670183) Bug: 77469384 Merged-In: I43bd3ada4853022728d217ff8b79c32026fc4974 Change-Id: I27b29113fabcbafe2ddaac97511f55a4f5278c44