Merge changes from topic "adb-mdns" am: 7ce4a267f5

Change-Id: Ic6f82f881955e933a57fb3663a085f254c83fa26