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