Fix in handling header decode errors am: c2395cd7 am: d6bee5d6 am: 802ef62d am: c80619d2 am: cc0bf707 am: 8db92f2f am: 071b9baf am: f3a15553 am: e305139e Change-Id: Id957a88b7716fc900ac84faabe75099309398a65