Merge "Add connection manager fallback" into lmp-mr1-dev