Merge "Merge "Avoid NPE caused by null encodedBearerData in privateGetSubmitPdu" am: f5523412 am: 9776c4cc am: e6b6ea85"