Merge "Merge "OBEX: Avoid pre-sending CONTINUE for SRM enabled case" am: edfb333a4d am: cca3c9bb01 am: 374bde37b9"