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

Change-Id: Ifcf4942fe36a2383150172c8122e029583b1567a