Merge "Return null for getSubmitPdu() for encoding failure instead of NPE" am: 75214226 am: 8795408c Change-Id: I214fd47fd23f6b9aa5b2de0e817c8eb32b77d1f7