Merge "Fallback to other format for decoding pdu if needed." am: 56a6b65322 am: 66ddf80901
am: 905013320e

Change-Id: I4afe0494981b3a24a963340eadec09e6a3292428