Merge "Update the handling of the native bridge property." into lmp-dev