Fails 530-checker-lse on arm64. Bug: 64091002, 65212948 This reverts commit cfa59b49. Change-Id: Icb5d6c805516db0a1d911c3ede9a246ccef89a22