Merge "Add ability to get device by address" into mnc-dev