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