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