[automerger skipped] Merge "Fixed that data retry on non-serviced transport"...
[automerger skipped] Merge "Fixed that data retry on non-serviced transport" am: a4c3eadc am: e4945b1c
am: 3b30f1a9 -s ours
am skip reason: change_id I46b455ea5b0ebcf2bdfbe3f0ace60d65e747f007 with SHA1 2c895a2d is in history
Change-Id: Ic455a5bd8a36c6eb102dbd815d4dd91dbb7eb9d8