Merge changes from topic "connectivity-br" am: 3c741f0315 am: 4ec34c0deb am: 8ce77bde75

Change-Id: Iff24c4b81698912e53c99fb8f6de2d765578103d