Merge "Merge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case" am: edfb333a am: cca3c9bb am: 374bde37"