Add a persistent transport alternative

Change-Id: I7b25770dded4351361b04345f4b17766c74ee7c3
Merge "Add a persistent transport alternative"