Fix in handling header decode errors am: c2395cd7 am: d6bee5d6 am: 802ef62d am: c80619d2 am: cc0bf707 am: 8db92f2f Change-Id: I8cc2a35789a4692c743b1e2a6dccc0bd36656cd7