Merge changes from topic 'adb-mdnsd' am: f4f95496ce am: 1b35c3f471
am: b3b862ed2e

Change-Id: I76a582914bb4d88350b9c9e1a30f99b2917b5b5a