Merge "Merge "Avoid NPE caused by null encodedBearerData in privateGetSubmitPdu" am: f552341204 am: 9776c4cce3 am: e6b6ea85f3"