Merge changes from topic "connectivity-br" am: 3c741f0315

Change-Id: I3d57ad0dd6c39197a7d943de01ebe381f6e427e4