Fails imgdiag_test on device. Bug: 26317072 Bug: 26320300 This reverts commit 288b1e9a. Change-Id: Iccd05827b0630281b6f959331eaa4202526df78e