This reverts commit fdca4cb5. Reason for revert: CHECK failure in device testing (bad checksum). Change-Id: I43bd3ada4853022728d217ff8b79c32026fc4974