Merge "Return null for getSubmitPdu() for encoding failure instead of NPE" am: 75214226c6 am: 8795408c51 am: 3948f04347

Change-Id: If01fb8574e8ee81854d97259347befff71c6fbab