This reverts commit bf55be5e. Reason for revert: b/279499046, remove temp logging Change-Id: Iafea6c0b6eb7113ccbbf52609816f6445e762af4