Merge "Fix pro-guard rules for service-nearby" into tm-dev