Fix debug info data type mismatch  error am: 945ebe97e8 am: 61f821371a am: a505d45948
am: 9871e7b56b

Change-Id: I68bc81ac6eef1e4f8a46314c539a238e78274679